From: Ian Campbell Date: Tue, 26 Jun 2012 15:23:58 +0000 (+0100) Subject: arm: fix locking in create_p2m_entries X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~8286 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=7224e175fbe4efa1ddfddf75ed1de3da886b825f;p=xen.git arm: fix locking in create_p2m_entries For some reason we were holding the lock over only the unmaps at the end of the function, rather than for the whole walk. We might want to be more clever in the future, but for now lets just lock for the whole walk+create process. Signed-off-by: Ian Campbell Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index ec41d38fbc..cf128701aa 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -130,6 +130,8 @@ static int create_p2m_entries(struct domain *d, paddr_t addr; unsigned long cur_first_offset = ~0, cur_second_offset = ~0; + spin_lock(&p2m->lock); + /* XXX Don't actually handle 40 bit guest physical addresses */ BUG_ON(start_gpaddr & 0x8000000000ULL); BUG_ON(end_gpaddr & 0x8000000000ULL); @@ -211,8 +213,6 @@ static int create_p2m_entries(struct domain *d, rc = 0; out: - spin_lock(&p2m->lock); - if (third) unmap_domain_page(third); if (second) unmap_domain_page(second); if (first) unmap_domain_page(first);